defaultvalue: Ignore more style properties that Adwaita overrides
authorIain Lane <iainl@gnome.org>
Thu, 19 Jul 2018 14:45:48 +0000 (15:45 +0100)
committerIain Lane <iainl@gnome.org>
Thu, 19 Jul 2018 15:29:14 +0000 (16:29 +0100)
These broke once we switched away from Raleigh

testsuite/gtk/defaultvalue.c

index b2a624f2a01146704a4540ee1f739642f764a9f5..d3afbb391a08106789f76b5c19b91b56835e300b 100644 (file)
@@ -398,6 +398,34 @@ G_GNUC_END_IGNORE_DEPRECATIONS
                strcmp (pspec->name, "button-spacing") == 0))
             continue;
 
+          if (g_type_is_a (type, GTK_TYPE_SCROLLBAR) &&
+              (strcmp (pspec->name, "has-backward-stepper") == 0 ||
+               strcmp (pspec->name, "has-forward-stepper") == 0))
+            continue;
+
+          if (g_type_is_a (type, GTK_TYPE_SCROLLED_WINDOW) &&
+              strcmp (pspec->name, "scrollbar-spacing") == 0)
+            continue;
+
+          if (g_type_is_a (type, GTK_TYPE_TEXT_VIEW) &&
+              strcmp (pspec->name, "error-underline-color") == 0)
+            continue;
+
+          if (g_type_is_a (type, GTK_TYPE_TOOL_BUTTON) &&
+              strcmp (pspec->name, "icon-spacing") == 0)
+            continue;
+
+          if (g_type_is_a (type, GTK_TYPE_TOOL_ITEM_GROUP) &&
+              strcmp (pspec->name, "expander-size") == 0)
+            continue;
+
+          if (g_type_is_a (type, GTK_TYPE_TREE_VIEW) &&
+              (strcmp (pspec->name, "expander-size") == 0 ||
+               strcmp (pspec->name, "grid-line-pattern") == 0 ||
+               strcmp (pspec->name, "horizontal-separator") == 0 ||
+               strcmp (pspec->name, "tree-line-pattern") == 0))
+            continue;
+
           /* This is desktop-dependent */
           if (g_type_is_a (type, GTK_TYPE_WINDOW) &&
               strcmp (pspec->name, "decoration-button-layout") == 0)